Merge pull request #8487 from nextcloud/backport/8486/stable-3.16
authorJyrki Gadinger <nilsding@nilsding.org>
Fri, 25 Jul 2025 13:06:34 +0000 (15:06 +0200)
committerGitHub <noreply@github.com>
Fri, 25 Jul 2025 13:06:34 +0000 (15:06 +0200)
commit187b5bc3ad359b8fd8783a86fa703def9537e827
tree6d6ec6fa127cfe9706671d3162a4026bb266912f
parent479b6a1964c6491aaef93a8a2b0ad17ab676e98a
parentf2c3742fea141bd42b5f2ab968965c0ef0da01f6
Merge pull request #8487 from nextcloud/backport/8486/stable-3.16

[stable-3.16] perf(activitylistmodel): store conflicts in a separate list